Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azurerm_redis_cache - support access_keys_authentication_disabled property #27039

Merged
merged 16 commits into from
Aug 21, 2024

Conversation

gerrytan
Copy link
Contributor

@gerrytan gerrytan commented Aug 14, 2024

Community Note

  • Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
  • Please do not leave comments along the lines of "+1", "me too" or "any updates", they generate extra noise for PR followers and do not help prioritize for review

Description

Adds support for access_keys_authentication_disabled property for azurerm_redis_cache

PR Checklist

  • I have followed the guidelines in our Contributing Documentation.
  • I have checked to ensure there aren't other open Pull Requests for the same update/change.
  • I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
  • I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
  • I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
    For example: “resource_name_here - description of change e.g. adding property new_property_name_here

Changes to existing Resource / Data Source

  • I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
  • I have written new tests for my resource or datasource changes & updated any relevent documentation.
  • I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
  • (For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

  • My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)
  • make acctests SERVICE='redis' TESTARGS='-run=TestAccRedisCache_AccessKeysAuthenticationEnabledDisabled' TESTTIMEOUT='120m' -
    output log

  • TestAccRedisCacheDataSource_standard - output log

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

This is a (please select all that apply):

  • Bug Fix
  • New Feature (ie adding a service, resource, or data source)
  • Enhancement
  • Breaking Change

Related Issue(s)

Fixes #26797

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

Copy link
Collaborator

@magodo magodo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this PR!
I have left some additional mostly minor comments that once addressed this should be good to merge 👍

website/docs/r/redis_cache.html.markdown Outdated Show resolved Hide resolved
website/docs/d/redis_cache.html.markdown Outdated Show resolved Hide resolved
internal/services/redis/validate/access_keys_auth.go Outdated Show resolved Hide resolved
Copy link
Collaborator

@magodo magodo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor comments, otherwise LGTM

internal/services/redis/redis_cache_resource.go Outdated Show resolved Hide resolved
internal/services/redis/redis_cache_resource.go Outdated Show resolved Hide resolved
Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this PR @gerrytan. Please see the comment left in-line, the property will need to be renamed to conform to our naming guidelines. Once that's done and the logic amended we can take another look through.

internal/services/redis/redis_cache_data_source.go Outdated Show resolved Hide resolved
internal/services/redis/redis_cache_data_source.go Outdated Show resolved Hide resolved
internal/services/redis/redis_cache_resource.go Outdated Show resolved Hide resolved
internal/services/redis/redis_cache_resource.go Outdated Show resolved Hide resolved
internal/services/redis/redis_cache_resource.go Outdated Show resolved Hide resolved
@magodo
Copy link
Collaborator

magodo commented Aug 19, 2024

Thanks @gerrytan, it LGTM now!

@gerrytan gerrytan force-pushed the redis-cache-access-keys-auth-prop branch from faa348a to a68b456 Compare August 19, 2024 23:30
@gerrytan
Copy link
Contributor Author

@stephybun @magodo this PR is now good for review. All feedbacks have been addressed and acctests have been rerun successfully, check the output log on the description.

Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @gerrytan, other than the two minor comments left in-line this looks good. Once those are resolved this should be ready to go in!

Comment on lines 352 to 356
accessKeyAuthEnabled := true
if props.DisableAccessKeyAuthentication != nil {
accessKeyAuthEnabled = !(*props.DisableAccessKeyAuthentication)
}
d.Set("access_keys_authentication_enabled", accessKeyAuthEnabled)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a common pattern in the provider to make use of pointer.From when setting properties that are pointers into state. pointer.From will nil check the input and if the pointer is nil will return the zero value for the type that was passed in, so this would be condensed down to:

Suggested change
accessKeyAuthEnabled := true
if props.DisableAccessKeyAuthentication != nil {
accessKeyAuthEnabled = !(*props.DisableAccessKeyAuthentication)
}
d.Set("access_keys_authentication_enabled", accessKeyAuthEnabled)
d.Set("access_keys_authentication_enabled", !pointer.From(props.DisableAccessKeyAuthentication))

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stephybun is right, I definitely missed this out.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah nice idea, thx @stephybun . I will alter the suggested code a bit: we want to make the expression defaults to true if we get nil value on DisableAccessKeyAuthentication.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in 50de57e

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gerrytan that is the outcome of my suggestion above.

If props.DisableAccessKeyAuthentication is nil, pointer.From will return false (the zero value for bools) which will result in true since it's being inverted. The variable initialization and nil check on lines 357-361 are redundant. Can you please apply the suggestion as made?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stephybun ah I get it now. Fixed in 5341f2f.

Comment on lines 863 to 867
accessKeyAuthEnabled := true
if props.DisableAccessKeyAuthentication != nil {
accessKeyAuthEnabled = !(*props.DisableAccessKeyAuthentication)
}
d.Set("access_keys_authentication_enabled", accessKeyAuthEnabled)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
accessKeyAuthEnabled := true
if props.DisableAccessKeyAuthentication != nil {
accessKeyAuthEnabled = !(*props.DisableAccessKeyAuthentication)
}
d.Set("access_keys_authentication_enabled", accessKeyAuthEnabled)
d.Set("access_keys_authentication_enabled", !pointer.From(props.DisableAccessKeyAuthentication))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in 50de57e

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 5341f2f

Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See responses to ongoing discussion in comments

Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies if my initial explanation of the pointer.From function wasn't clear, thanks for making those changes @gerrytan LGTM 🍎

@stephybun stephybun merged commit ca742ee into hashicorp:main Aug 21, 2024
33 checks passed
@github-actions github-actions bot added this to the v3.117.0 milestone Aug 21, 2024
@stephybun stephybun modified the milestones: v3.117.0, v4.0.0 Aug 21, 2024
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for Microsoft.Cache for Redis API v2024-03-01
3 participants